From 36104e9cc197be40af285aac6eeff6ceba3382a4 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Tue, 15 Jun 2004 12:29:06 +0000 Subject: [PATCH] bitkeeper revision 1.967 (40ceeb92vNfaaKBynIvwxTk_bFH78w) Change default unprivileged linux-xen config. --- .../arch/xen/defconfig-xenU | 35 ++++++++++++++++--- .../arch/xen/drivers/console/console.c | 4 +-- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU index 9ccf9528de..8a9fdf2411 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU +++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU @@ -10,14 +10,14 @@ CONFIG_UID16=y # # Xen # -CONFIG_XEN_PRIVILEGED_GUEST=y +# CONFIG_XEN_PRIVILEGED_GUEST is not set # CONFIG_XEN_PHYSDEV_ACCESS is not set CONFIG_NO_IDLE_HZ=y # # Code maturity level options # -# CONFIG_EXPERIMENTAL is not set +CONFIG_EXPERIMENTAL=y # # Loadable module support @@ -85,6 +85,7 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set # CONFIG_INET_ECN is not set # CONFIG_SYN_COOKIES is not set @@ -96,6 +97,7 @@ CONFIG_IP_NF_FTP=y # CONFIG_IP_NF_AMANDA is not set CONFIG_IP_NF_TFTP=y CONFIG_IP_NF_IRC=y +# CONFIG_IP_NF_QUEUE is not set CONFIG_IP_NF_IPTABLES=y # CONFIG_IP_NF_MATCH_LIMIT is not set # CONFIG_IP_NF_MATCH_MAC is not set @@ -113,13 +115,17 @@ CONFIG_IP_NF_IPTABLES=y # CONFIG_IP_NF_MATCH_HELPER is not set CONFIG_IP_NF_MATCH_STATE=y CONFIG_IP_NF_MATCH_CONNTRACK=y +# CONFIG_IP_NF_MATCH_UNCLEAN is not set +# CONFIG_IP_NF_MATCH_OWNER is not set CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y +# CONFIG_IP_NF_TARGET_MIRROR is not set CONFIG_IP_NF_NAT=y CONFIG_IP_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=y CONFIG_IP_NF_TARGET_REDIRECT=y # CONFIG_IP_NF_NAT_LOCAL is not set +# CONFIG_IP_NF_NAT_SNMP_BASIC is not set CONFIG_IP_NF_NAT_IRC=y CONFIG_IP_NF_NAT_FTP=y CONFIG_IP_NF_NAT_TFTP=y @@ -133,6 +139,14 @@ CONFIG_IP_NF_TARGET_ULOG=y # IP: Virtual Server Configuration # # CONFIG_IP_VS is not set +# CONFIG_IPV6 is not set +# CONFIG_KHTTPD is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set +# CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set # @@ -147,6 +161,14 @@ CONFIG_IP_NF_TARGET_ULOG=y # CONFIG_DEV_APPLETALK is not set # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_LLC is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_FASTROUTE is not set +# CONFIG_NET_HW_FLOWCONTROL is not set # # QoS and/or fair queueing @@ -172,7 +194,7 @@ CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set -# CONFIG_CHR_DEV_SG is not set +CONFIG_CHR_DEV_SG=y # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -190,6 +212,7 @@ CONFIG_SD_EXTRA_DEVS=40 # CONFIG_SCSI_AHA152X is not set # CONFIG_SCSI_AHA1542 is not set # CONFIG_SCSI_AHA1740 is not set +# CONFIG_SCSI_AACRAID is not set # CONFIG_SCSI_AIC7XXX is not set # CONFIG_SCSI_AIC79XX is not set # CONFIG_SCSI_AIC7XXX_OLD is not set @@ -227,6 +250,7 @@ CONFIG_SD_EXTRA_DEVS=40 # CONFIG_SCSI_U14_34F is not set # CONFIG_SCSI_ULTRASTOR is not set # CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set # # Block devices @@ -324,6 +348,7 @@ CONFIG_PSMOUSE=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set +# CONFIG_SONYPI is not set # # Ftape, the floppy tape device driver @@ -495,7 +520,7 @@ CONFIG_NLS_ISO8859_1=y # Console drivers # CONFIG_XEN_CONSOLE=y -CONFIG_VGA_CONSOLE=y +# CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y # @@ -506,7 +531,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_HIGHMEM is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_IOVIRT is not set -CONFIG_MAGIC_SYSRQ=y +# CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_KALLSYMS=y diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/console/console.c b/linux-2.4.26-xen-sparse/arch/xen/drivers/console/console.c index 91b97e83d9..aa826be7d9 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/console/console.c +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/console/console.c @@ -585,7 +585,7 @@ static int __init xencons_init(void) xencons_driver.wait_until_sent = xencons_wait_until_sent; if ( tty_register_driver(&xencons_driver) ) - panic("Couldn't register Xen virtual console driver\n"); + panic("Couldn't register Xen virtual console driver as %s\n",xencons_driver.name); if ( start_info.flags & SIF_INITDOMAIN ) { @@ -598,7 +598,7 @@ static int __init xencons_init(void) (void)ctrl_if_register_receiver(CMSG_CONSOLE, xencons_rx, 0); } - printk("Xen virtual console successfully installed\n"); + printk("Xen virtual console successfully installed as %s\n",xencons_driver.name); return 0; } -- 2.30.2